Adwaita: style flowbox tiles

+ fixups by Daniel Boles from gtk-3-22

https://bugzilla.gnome.org/show_bug.cgi?id=779073

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c168b66eb879f8c485e93dcec873329bc4911d2a..eade9e297f54d871d7e3b2eb4e7abe31d781f381 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -139,7 +139,6 @@ flowbox {
 
   flowboxchild {
     padding: 3px;
-    border-radius: 3px;
 
     &:selected {
       @extend %selected_items;
@@ -149,6 +148,17 @@ flowbox {
   }
 }
 
+.content-view .tile {
+  margin: 2px;
+  background-color: if($variant=='light', transparent, black);
+  border-radius: 0;
+  padding: 0;
+
+  &:backdrop { background-color: if($variant=='light', transparent, darken($backdrop_base_color,5%)); }
+  &:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
+  &:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
+}
+
 label {
   caret-color: currentColor; // this shouldn't be needed.
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 270d140ae253ce9c4a7a3d47fdee7d166506c316..71eb863d1c1e71f6fe416c1936062d448ccaa2ba 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -97,11 +97,22 @@ treeview.view rubberband,
   background-color: rgba(24, 68, 114, 0.2); }
 
 flowbox flowboxchild {
-  padding: 3px;
-  border-radius: 3px; }
+  padding: 3px; }
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
+.content-view .tile {
+  margin: 2px;
+  background-color: black;
+  border-radius: 0;
+  padding: 0; }
+  .content-view .tile:backdrop {
+    background-color: #1a1d1e; }
+  .content-view .tile:active, .content-view .tile:selected {
+    background-color: #215d9c; }
+  .content-view .tile:disabled {
+    background-color: #2d3234; }
+
 label {
   caret-color: currentColor; }
   label.separator {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 07f8b2a100a28de3d9b77761e1cc4f41d15369b7..de9c23f5ab867713fd26a576463b338ec4d104de 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -97,11 +97,22 @@ treeview.view rubberband,
   background-color: rgba(42, 118, 198, 0.2); }
 
 flowbox flowboxchild {
-  padding: 3px;
-  border-radius: 3px; }
+  padding: 3px; }
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
+.content-view .tile {
+  margin: 2px;
+  background-color: transparent;
+  border-radius: 0;
+  padding: 0; }
+  .content-view .tile:backdrop {
+    background-color: transparent; }
+  .content-view .tile:active, .content-view .tile:selected {
+    background-color: transparent; }
+  .content-view .tile:disabled {
+    background-color: transparent; }
+
 label {
   caret-color: currentColor; }
   label.separator {